From dd75ed5c14704862b547412086cde5dcc671997e Mon Sep 17 00:00:00 2001 From: Fatih Acar Date: Mon, 30 Jan 2017 15:33:18 +0100 Subject: [PATCH] xl: Fix assertion on domain reboot with new configuration libxl_domain_build_info_dispose is not resetting the type field to LIBXL_DOMAIN_TYPE_INVALID. Instead, it is memseting the struct to 0 thus when libxl_domain_build_info_init_type is called after a dispose on the same struct, an assertion is triggered because type != LIBXL_DOMAIN_TYPE_INVALID. Calling libxl_domain_build_info_init makes sure the type field is correctly initialized. Signed-off-by: Fatih Acar Signed-off-by: Nikita Kozlov Signed-off-by: Vincent Legout Signed-off-by: Baptiste Daroussin Acked-by: Wei Liu --- tools/libxl/xl_cmdimpl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 7e8a8ae5c4..196b8a6851 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2535,6 +2535,7 @@ static void reload_domain_config(uint32_t domid, if (t_len > 0) { LOG("\"xl\" configuration found, using it\n"); libxl_domain_config_dispose(d_config); + libxl_domain_config_init(d_config); parse_config_data("", (const char *)t_data, t_len, d_config); free(t_data); -- 2.30.2